diff --git a/system/core/Lang.php b/system/core/Lang.php
index 47f6c00..9e6f437 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -117,7 +117,7 @@
 		{
 			foreach (get_instance()->load->get_package_paths(TRUE) as $package_path)
 			{
-				$package_path .= 'language/'.$idiom.'/'.$langpath;
+				$package_path .= 'language/'.$idiom.'/'.$langfile;
 				if ($basepath !== $package_path && file_exists($package_path))
 				{
 					include($package_path);
diff --git a/system/helpers/language_helper.php b/system/helpers/language_helper.php
index f931208..6d24a9c 100644
--- a/system/helpers/language_helper.php
+++ b/system/helpers/language_helper.php
@@ -55,9 +55,9 @@
 		$CI =& get_instance();
 		$line = $CI->lang->line($line);
 
-		if ($id !== '')
+		if ($for !== '')
 		{
-			$line = '<label for="'.$id.'"'._stringify_attributes($attributes).'>'.$line.'</label>';
+			$line = '<label for="'.$for.'"'._stringify_attributes($attributes).'>'.$line.'</label>';
 		}
 
 		return $line;